...and don't forget to initalize priv->columns to 1.

Tue Feb 17 23:28:33 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkmenu.c (gtk_menu_init): ...and don't forget to initalize
	priv->columns to 1.

diff --git a/ChangeLog b/ChangeLog
index e40fde338e2a3a8284d2c2657cbbd49404152fb0..46e1aadfd669790d9d5ee8bb4922b771e30ea6a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Feb 17 23:28:33 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkmenu.c (gtk_menu_init): ...and don't forget to initalize
+       priv->columns to 1.
+
 Tue Feb 17 23:11:21 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkmenu.c (gtk_menu_do_remove): Make sure that we keep

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e40fde338e2a3a8284d2c2657cbbd49404152fb0..46e1aadfd669790d9d5ee8bb4922b771e30ea6a8 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Tue Feb 17 23:28:33 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkmenu.c (gtk_menu_init): ...and don't forget to initalize
+       priv->columns to 1.
+
 Tue Feb 17 23:11:21 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkmenu.c (gtk_menu_do_remove): Make sure that we keep

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e40fde338e2a3a8284d2c2657cbbd49404152fb0..46e1aadfd669790d9d5ee8bb4922b771e30ea6a8 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Tue Feb 17 23:28:33 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkmenu.c (gtk_menu_init): ...and don't forget to initalize
+       priv->columns to 1.
+
 Tue Feb 17 23:11:21 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkmenu.c (gtk_menu_do_remove): Make sure that we keep

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e40fde338e2a3a8284d2c2657cbbd49404152fb0..46e1aadfd669790d9d5ee8bb4922b771e30ea6a8 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Tue Feb 17 23:28:33 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkmenu.c (gtk_menu_init): ...and don't forget to initalize
+       priv->columns to 1.
+
 Tue Feb 17 23:11:21 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkmenu.c (gtk_menu_do_remove): Make sure that we keep

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e40fde338e2a3a8284d2c2657cbbd49404152fb0..46e1aadfd669790d9d5ee8bb4922b771e30ea6a8 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Tue Feb 17 23:28:33 2004  Matthias Clasen  <maclas@gmx.de>
+
+       * gtk/gtkmenu.c (gtk_menu_init): ...and don't forget to initalize
+       priv->columns to 1.
+
 Tue Feb 17 23:11:21 2004  Matthias Clasen  <maclas@gmx.de>
 
        * gtk/gtkmenu.c (gtk_menu_do_remove): Make sure that we keep

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index acdd57a3c301b0d869451b63bd19175cc515b50d..6bc690b025a61588bc134234f5fdeae4ab6d76af 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -710,6 +710,8 @@ gtk_menu_window_size_request (GtkWidget      *window,
 static void
 gtk_menu_init (GtkMenu *menu)
 {
+  GtkMenuPrivate *priv = gtk_menu_get_private (menu);
+
   menu->parent_menu_item = NULL;
   menu->old_active_menu_item = NULL;
   menu->accel_group = NULL;
@@ -755,6 +757,8 @@ gtk_menu_init (GtkMenu *menu)
   menu->lower_arrow_prelight = FALSE;
   
   MENU_NEEDS_RESIZE (menu) = TRUE;
+
+  priv->columns = 1;
 }
 
 static void
@@ -949,7 +953,7 @@ gtk_menu_do_remove (GtkMenuShell *menu_shell,
   single_column = priv->columns == 1;
 
   /* Recalculate these, assuming the child has already been removed. 
-   * Note that an empty menu is assumed to have one column.
+   * Note that an empty menu is assumed to have one column
    */
   priv->rows = 0;
   priv->columns = 1;